Don't pass enums by reference
Use error wrappers in error handler
Rename files