Neater Option handling
Squeeze up options processing