Rakefile style tweaks