cleanup, minor changes