Clean up typography more