fixups
code format