Updated data cleaning & prediction