Minor style and readability updates
Minor formatting and readability updates