Refactor all things