Added comments. Minor cleanup.