Cleanups

Some old work that I'd done ...