use a bit more Stream API