Addressed Scalastyle issues.