Limit scope of variable
Mark constant field as static
Wrap long line and remove unneeded semicolon
Simplify if statements
Fix Javadoc