Moving along paths, refactoring.