Just some cleanup, and a shout-out to Mathematical