Add verbose option and remove return_code var