comments and line removal notived during code review