Refactor on wtime