Some cleanup and udpated lfopt.optimize for case of risk-free assets