fixed format, attribute order, removed clutter