Continue map simplification
Consolidate path calculation