Pylint on code and minor tweaks