Formal/lint fixups