Changed my header files and adjusted my cpp file. Added simplify
function.