Refactoring again...