Added more things to clean_data function, added better dplyr support