cleanup and performance tweaks.