Removed unnecessary scope and its call. Properties will be populated by order in which they were created to improve UX. Renamed id argument to prop + small coding style change.