integrated comments from reviewer (will squash this commit)