Minor cleanup and content change