minor tweaks after thinking of this a bit more