minor cleanups as jan suggested