fixup! Code review cleanup and fixes