Address checkstyle issues in preparation for tighter enforcement

Resolves: https://www.pivotaltracker.com/story/show/71323804