Tidied up padding on right of commodity code