Removed Api Service data formating that should be reserved for ui