Refactored loading to look better and avoid null pet exceptions