Refactorization of Univariable approach