Syntax style improvements