Refactor to use object deconstruction
Refactor to use object deconstruction

devpunks/snuggsi,snuggs/snuggsi,devpunks/snuggsi,snuggs/snuggsi,devpunks/snuggsi,snuggs/snuggsi,devpunks/snuggsi,snuggs/snuggsi,devpunks/snuggsi