More clean up and a cleaner way of doing options.