Add a little comments and a little clean up.

Summary: