Switch to Scala 2.11
refactoring