Fix spacing and add zeros