minor tweak to var names