Code cleanup and easier to invoke. No infinity value must be supplied.