Review and a little refactoring