more cleanup in feedback form