Structured format design fixed up all nice