Cleanup and fixing rakefile