PassReminder: refactoring