Remove space in number format
Minor tweaks