Reformat codebase to conform to PSR 1/2