Refactoring to streams again.