Refactoring. It's not perfect, but I'm getting there.