syntax cleanups
Merge pull request #1 from ohadlevy/syntax

syntax cleanups