reformatted last comitt's code to be psr2 compatible.