Fixing return data. Getting rid of "data"