fix simple code review issues