Some refactoring in Build.scala
Indentation fix