Clarify naming
Avoid more branching
Avoid map