Fixed some issues, PEP8