Refactor user payment report. #170