Refactor of BirthdayService