Refactor all the things... again!