refactoring of variable model and pojo