Some modifications

Some modifications on the files