Cleanups

only some minor cleanups