Refactor - move of method