Reindenting and keeping things sane