more code cleanups, no functionnaity change