2nd pass, refactor
2nd pass, comment/refactor