Refactor destructuring

Merged username-removed-506044 requested to merge refactor-destructuring into master