refactoring expense table model