- Small refactoring
 - Tests added