2nd pass, comment/refactor