bunch of pylint and stylistic changes