Neatened up Build.scala