Cleanup, simpler name
Merge pull request #1 from asenchi/cleanup

Cleanup, simpler name