syntax cleanups