Refactor of application options to allow easy adjustment