Reindentation and tidying.