made containers/values consistent & documented