Cleanups

Cleanups in all source files