louis' code review for real this time cmon

louis' code review for real this time cmon