Made #14 lambda more elegant