Cleaned up some syntax.
Merge branch 'FEATURE_syntax' into develop