code cleanup & eliminated extraneous strtod's