Cleanups

some simple cleanups