Add paid expenses, and refactoring some functions