[Feature] - Cleaner
Merge pull request #1 from challenging/cleaner

[Feature] - Cleaner