Some refactoring
Refactoring
More testing