Removed package in local scope
small edits
merge