Tidy up Application.scala