Refactor because, yes...