Minor clean up. Some formatting changes, removal of commented out code.