Cleanup and comment tweaks