indentation fix using reindent.py
manual indentation fix, more consistent now
manual indentation fix, more consistent now