Code inspection cleanups