small refine and tweak