Updated with first draft of clean data and query