Replace lambda with clearer form
Replace faces with built-ins