destructuring cleanup
version 1.3