Updated Rakefile and fixed lint-warnings