Some minor cleaning up of code.