Reindend and check comments