Refactor font loading