formatting and readability changes