code cleanups.