fix indent and inline some function (move them to CallHandler.h)
fix async_retval