Remove unused file
pep8 and refactor
Add file names to output