Code analysis refactoring continued - mainly legacy