Refactoring stuff.