Refactor + Code analysis