cosmetic code tidy