A bunch of scalastyle driven improvements.