Refactor with @sebrose