- Improved Layout
- Refactored Names
- Error handling