refactored events and expenses models