refactored method in presenter and model