Cleaned up data loader a bit