small work on reflexive verbs, refactored naming on model (partial)