refactor msm8974