[minor] tweaks brandon suggested