Minor cleanup

Just a few minor readability improvements