Most of the changes here are indentation fixes by @qmaruf - it is the official correct indentation unlike what it was before, but imho it's not a good idea to bundle random indentation fixes into a feature pull - opinions? :)