Clean indentations

This is the first step to trying to clean anything up ;-) From here out it will be very difficult to merge changes not based on this commit: If you've made any, please let me know and I'll re-build the commit from your latest.