clean up options logic