Syntax cleanups