Cleanup debug codes and improve comment lines.