Modified indentation in places (PEP8)