- minor refactoring
- more minor refactoring
- removing unused