Fixture / Refactor scalastyle / builders