Scalastyle improvements