Minor changes base don code review