cleanup against review comments