Removed code duplication for fonts