Just a few cosmetic changes to the source