Modularized the feature vector portion.