Sorted out some code formatting and extraneous code.