refactor renewal