Some small changes, including the style