More source readability updates