some minor syntax cleanups