New file names and removal of some redundant blank lines