Taking care of review comments