Second fix to code cleanup