Reformatted code with PSR2 standards