Fixed a few Scalastyle warnings