Minor improvements in the style of the code