refactors and comments from live code review

:-)