yet more code cleanups