Clean up Syntax