Font loading refactored