LYFT-14491 - implement code review changes