refactor glory