Refactoring again.