Added and clean-up code comments.