Comments
Rakefile refactor