Started refactoring list and also started proper filename dispaly in case of error