Undid a lot of indention changes in order to let the upstream people focus on the specific changes