Refactoring sesh

The refactoring we did today :sunglasses: