Code cleaning
(esp. for scala 2.10)