Reformatted code to PSR1/PSR2