some cleanup
Merge pull request #452 from nelenkov/revenue

some cleanup, see #444