Cleaner destructuring code (#14)