Some minor cleaning up (#31).