Add verbosity option; remove options struct