Improving format and code readability.