Indentation and spacing fixes, according to PEP8