PSR-2 style code reformat