LYFT-14491 - implement code review comments - more simple