Don't show entire file path + Cleanup