Update 3.09

Readability improvement.  still think the syntax is a bit noisy