Refactoring options checking