Cleanup + minor tweaks