Remove unnecessary parantheses
Add missing final keyword