rivers: refactor methods that alter rivers