Vertex format refactor