Fix Scalastyle failures