Period refactor