Removed and restructured comments and debug output.