Fix indent.
Fix typo.
Use Enum as suggested by Mark
Remove code commented out prior to this PR.

No need to keep it.
Fix text after cut and paste.
Remove unused import.
Replace True by False in Java doc.