Issue 18 clean up rakefile