Merge "Amended some comments for clarity"