Refactored the reminders functionality