Cleanup and clarify
Generalize example