cleanup and tweak