Refactoring stuff because of reasons.