minor cleanups to new code