refactor: improved some River's private methods