Refactoring:
- added/updated comments
- deleted unused commands
- idents