refactor, I'm sick today