address more code review suggestions