Improved style of some of the code in  Rakefile.