Cleanup of section code per code review