Refactoring =^.^=