Minor cleanup and content replacement