Added data cleaning steps. Still need to resolve some missing fields