code review feedback fixes