minor syntax cleanups