Minor tweaks to the code.