fixups to code style