Remove reserved font name
some automatic changes
Cleaning up and improve spacing