Enhanced code readability, re-worded some questions