clean up and cosmetic changes