cleanup and adding scalastyle