Add a few comments around the code
Add a few missing 'final' modifiers