More code inspection cleanup