more code cleanups.