Simplify and cleanup syntax
Merge pull request #105 from koraktor/cleanup

Simplify and cleanup syntax