clean-up and cosmetic fixes