Clean up the syntax