Some code cleanup to remove double or even tripel-use of 'options'