refactor ScalaElements