Updated format and indentation