formatting and readability improvements