Refactor options

Looks like you've changed the license?