Cleanup

There were a few more points to consolidate.