More cleaning power
Merge pull request #24 from joshhoegen/clean

More cleaning power