Scalastyle fixes