oh boy, I do love to refactor code, don't I