Refactoring: moved methods