Use scala 2.11
Small refactorings