Code Review refactorings