Fixed format errors and structure