delete too-tricky refactor
better names, I guess