Update of some files and indentation change