Followed up on code review for timezones