Pylint and readability fixes