little refactoring on the rake