Clean up pathFor()