small cleanups.