Refactorings...