Updates in plugin after code review - minor updates