Zen: simplify when ever possible

Zen: simplify when ever possible, originally uploaded by rbaez.