Code analysis refactoring