Some refactoring again