Don't need a separate class for filename lookup
Remove puts