Refactoring
Quality refactoring