Mooaaaarrr refactoring