expense-tracker: cleanup, comments, DS class deactivator