A few Rakefile refacto