SCORE-149. Fix Checkstyle and findbugs from SCORE-148

issue: https://jira.kiji.org/browse/SCORE-149
review: https://review.kiji.org/r/1569
over-the-shoulder-reviewers: clint