Reviewed code to use only one option