Code clean up/tweak