Little bit of clean up for _data function call (was being run twice)