Simplify format definition and lookup