Corrected comments and removed debug code