some cleanups here and there