Cleanup.  Made sure double values were being used in some places