Refactorings based on feedback in class