Got comments sorted out