Reduced memory usage and cleaned up logic for pulling / processing.