Cleanup & tweaks