Refactor and clean up all the things
Refactor and clean up many more things