more Scalastyle fixes