More trivial cleaning up

Cleaning up and code changes + a shoutout to the #c irc channel