* Minor Option Structure Refactoring