scalastyle config and fixes