Some minor cleaning up. (4b4b259)