Add final modifiers where relevant