Aaaaand one moar refactor.