cleanup & tweaks