Removed some unused debug code and cleaned up some white space.