Cleaned up some destructuring