Code refractoring - Parser & Solvers