Add a few final modifiers and edit a comment