Cleanup

Just cleaning things up, no behavioral changes here.