- first big code clean up iteration
- reorder methods
- delete dead code