Made some formatting changes suggested by pylint