Code inspection cleanup