Comments were clean-upped.