ENH: Code structure + Removed inv. of Hessian