Implement Alex's suggested refactor to break out feature engineering

[#71505794]