Refactor code for pickup info window