Refactor cost report