- small cleanups