Rescuetime refactor