cosmetic code fixes