Refactor options

Signed-off-by: nscavell <nick.scavelli@gmail.com>
Fixed copyright headers