Syntax Cleanup