Cleanup
Fixed lint issues
Removed a catch where we threw right after