Minor changes, readability improvements