slight cleanups