More tweaks to make the code a little more readable.