Improved style and readability