Checkstyle fixes.
Adds extra checkstyle checks.
Checkstyle fixes.