Improve comments in function. Add things to do.