Code formatting, add final modifiers