Commented and did some reindenting.