Refactor to add constants