Condensed the name formatting/padding code!