Some refactoring
Refactoring