Minor tidy up to get 7 days' data and clearer attr names