Fix close on dialog so the message "user aborted" only appears if the user closes the dialog
Use nice names for the modules