Refactoring all the stuff...