Revert "clean up Yed's code a little"

This reverts commit bfa5ea16ac7224f17f0e581a019cf8d57705135b.