syntax fixups
more cleanup