Assorted nitpicking code-style