Refactor: Wrap up the options