PEP8 related fixes. Python follows indentation of mulitples of 4 not 2, so set your editors properly.