Refining some codes & comments.