Cleaned the way options are processed