Fixed some mixed refactorings