Code review comments.  Should be squashed prior to pushing