refactor for Build.scala