Revised code formatting a bit.