added- code review changes for highlight issued #16 and #18