added small changes from code review