tidied up Rakefile