Merge "Updated comments for clarity"