CR changes: alphabetical order + tab -> space