addred some responsivity; cleanup