Reindent stage2