Some minor cleaning up.