Rake cleanup

Improves on #299.