Added few comments as per review comments!

Change-Id: I3413ac9e032c1d81d27798d4e7b1a86b3f533b76