Cleanups

small cleanups