Added scalastyle and implemented some suggestions from scalastyle