Continue cleaning
Merge pull request #2 from novapost/cleaning

Continue cleaning