Improve feedback message
Improve method to test if files exists
Remove unnecessary validation