some slight cleanups