scalastyle issues corrected