Refactoring and some tests