tweak and clean up