Simplify error handling doe and use typedefs to simplify code