Fixed generics in FormatUtil