improved style and readability