Some code refactoring and included overwrite flag in the help.