Refactored birthday stuff