make jjubenv's suggested changes