cleaned code with codemaid
Merge branch 'master'