WP-2186 Cleaned up the formatting of the code a bit to make it easier to read.