Just as an fyi, I would double-check your city's water standards and test results.
If they add ammonia and chlorine to the water supply, that makes chloramine, not chlorine. Chlorine evaporates, chloramine doesn't. So if you really want to treat it you need to pick up an aquarium water...