Refactor options objects a bit to make it more legible