cleanup and comenting.