fix some scalastyle issues