Cleaned up sample and data references