Further file cleanup, print statements improved