Improve comments. Code clean up.