Some kind of refactoring...