expense-tracker: optimization, refactored rules