improve code readability (whitespace removed)
ensure operator precedence
Merge pull request #26 from frabbit/genpy

improvements