2nd pass. minor refactor/comment
2nd pass, minor comments