Refactoring of Expense
Refactored Services
Refactoring of Terms
Bugfixing to make the program work again