Changed data building so that vectorizer cleans data rather than me