issue_113: refactor income listing