Refactor CFD chart creation