Some changes to improve the style