Finished up splitting variable selection logic