Faizaan comment fixes