added response class
cleanup