Refactor all the things