Reindent some code and doc