Cosmetic refactor: add final keyword where possible