code review changes + more consistent comment spacing