bug fixed + PEP8