Replace some warzone operations with java 8 stream functions