Applied some pylint warning / error fixes