house cleaning
Fix missing overwrite flag
More refactoring and cleaning