Refactor if/elif chain for clarity and speed