Fixed reminder when null
Cleaned up