cleanup from jme's feedback