Remove some space in files and fix some element in files