cleanup analog to P::W::S::consumes
Merge pull request #3 from mokko/pr/cleanup

cleanup analog to P::W::S::consumes