code clean/tweak