[issue-313] Syntax tidying