Improve some files