Fixed file names
Some comments eliminated.