Formatted again and a few minor changes.