Use cleaner at_term function
Improve Rakefile a bit