Just some cosmetics and some cleaning up to make the code fit in a little better with the existing code. Functionally no changes are made and the existing tests still pass.