Code after Code analysis and refactoring.