-cosmetic changes to the code