Some fixes and cleanups
Cleansing