Scalastyle improvements.