Refactor using model associations