more cleanup on the code review post