Ignore Emacs junk
Refactor with simpler thread first macro
Remove extra whitespace