Refactor code
Merge branch 'master' of https://github.com/Hlavson/ProjectCleaner.git