minor cleanups for consistency