Simplify Rake tasks