Fixing format and indentation