Pretty much all split up and reindented.