Simplify stuff
Improve rake integration