Fix codacy issues for mergeback to master #88

Closed ironjan closed 7 years ago