- view refactoring
- error handling refactoring
- cleanups