Clean up syntax

Maxime Lefrançoisrequested to merge
syntax into develop-v2.1.1

Looks like a lot of changes, but it's really just cosmetic

Merge request reports