Simple Improvements from Static Analysis

These two commits bring the codebase better in line with style guide and Java Language Level Seven.