707 - refactoring