Refactor all the things !