clean up and simplification of Jordan's implementation