Some refactoring
Some refactoring