Changing according to code review