Added functions to parse data into cleaner format