Fixed format and indentations