incorporate style feedback from @sporkmonger on ab23fe7539ac