Code quality improved according to the latest lint report

Code quality improved according to the latest lint report
Merge branch 'master' of https://github.com/MusesProject/MusesClient