I do a little refactoring here