Minor: added forgotten 'final' and trailing newlines