Refactor options

What is this then:

- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html