Rake refactor