Convert more calls to uses lenses
Rename GameContext
Reformulate component utils
Simplify
Extract sortOnMaybe function
Clean up