Code reformat

Code should look better for now. (code sniffed with psr2)