Refactoring and added editor option as shortcut for edit -e