Modified PEP8 and other errors