Clean up the options array code