- Add 'Quit' functionality
- Refactoring code