added two reminder options and compacted code