Resolved Scalastyle issues.
Removed redundant braces.
Resolved Scalastyle issues.
Removed redundant braces.
Removed redundant braces.
Reformatted to reflect current source standards.
Resolved Scalastyle issues.
Resolved scalastyle issues.
Resolved scalastyle issues.