Fixed error as well as PEP8