Minor readability changes

Some minor changes to improve the clarity of the code.

Note that these changes were not tested!