clean up spacing and braces according to PSR-2 rules