Clean up style and formatting
Clean up Rakefile