Small changes - Added some comments