Refactorings!!!