fixing data output with better dict keys