Return more info from status, simplify variable naming