bunch of small cleanups