Stroop Model Refactor