Implement lambda Code Review comments