Refactor to appropriate private