- Implement comments
- Refactor anonymous class -> Input