Break out options for nicer refactoring later