More main.scala:main() refactoring