comment and touch up code