solve_univariate: Misc Stylistic changes