Update code comments, remove debugging lines.