Syntax clean-up