Small cleanup

some small cleanups