Refactor of all the things