Some minor cleaning up (#142).