Ocean story refactoring