Refactorings done during code review