Use figure space for number padding
Fix trailing whitespace