more using statement tweaks