Cleaning + updating filename