Refactor all the things!!!