Scalastyle corrections