Syntax clean up