Cleanup; simplification; etc.