Little editing, mostly tabs for readability