Refactor financials and Optimizer Per Client