Refactored some names and general cleanup
Reverted back to handling all errors