Fixed formatting so it aligns with PEP8
Some various fixes