Fixed code review changes. ready to merge