nicer response
cleanup fix