Refactoring
Refactoring
Code quality improvements