- Further cleaning
- jumping moved to separate class