Code analysis cleanup