Cleanups

very basic cleanups