Refactoring =^_._^=