cosmetic code clean-up