cosmetic changes to code mostly