Improved number formating + removed some debug code.