Revised the terminology being used.
Added some comments.