Fix scalastyle errors