font refactors for consistency