Fix scalastyle issues