Refactor: test letters first, then options