cleanup, minor improvements