Feature/cleanup 3

- Refactor & cleanup
- fix small bugs