The stuff in plastic bottles is usually spring water. Isn't yours? Nothing wrong w/ that, just don't leave them in the sun.
Been thinking about getting a faucet filter myself, one that removes both fluoride and chlorine. Right now I fill up jugs at the spring water stand, 30 cents a gallon.