Code analysis refactoring continued