Clear up confusing reuse of instance variable name and enforcement of finality
A variety of syntax, spelling, and Java-specific fixes