Refactored code and added new per file display.