Refactor/reminder factory