Cleanup
Merge branch 'features/syntactical'