Refactor revenue action