Add whitespace and comments to increase readability