Addressed some Scalastyle issues.