Fixed comments as per review feedback.