Scalastyle

rebased the scalastyle changes on top of @velvia scalac flag changes