camelCase and simplify the options logic