Get rid of ugly string concatenations and more PEP8