Moved removal of decimal point up.