Reformatted code. Should be mostly PSR-2 now.