Code review changes

Minor fixes, mainly removing unneeded lines, and some fixes to the placement of DEBUG_TAB declaration.