JHE: Cleanup the code by using pylint advices