simplified expense aggregation by type
deleted unused imports