refactoring
Another refactoring commit