Minor sylistic changes to the code.