Updated format and indentation in select and common