Cleaned up pathFor