Some Cleanup

A minor commit with no real changes.