cleaned it up even more with help of Pylint.