Refactoring: some logic move helper methods