Refactor error handling
Refactor controllers & routes