Just some OCD changes: use destructuring, threading

A few things that made the code more readable for me, personally. Might not be useful/meaningful to others, but here it is just in case.