some cleanup
some cleanups