fixup! clean lint
fixup! temp changes to eval disconnect error
fixup! no need for return
fixup! don't generate keys twice