Refactor methods by Harry