code review adjustments @lizlux