Syntax

While awaiting the landing of pull request #18 I cleaned up the code.
I would recommend to merge this one first.

Please peer review.