Update the style and enhanced readability