Refactor OS stats