NAWQAAN-334

Clearing up the scientific notation, I had some changes in here that clear up a bit but don't change functionality.