Improve consistency with http://docs.scala-lang.org/style