Converted indentation to spaces
Cleanup and PEP8 alignment