refactor / tidyup of reminder delivery