Refactor revenue