Some refactoring and the code review response