REFACTOR TIME