Rake refactor

Madam President.