clean up spacing and bracing according to PSR-2