Small refactor
Small refactors
Finished most major refactoring