Better build.sbt + cleanup