Tidy up logic in Estimate->listEstimates() method