Updated variable name in solver
Refactored double comparison to be separate extension class