Move note to top
Remove unused var
PSR-2 compliance